(cherry picked from commit a153bb61) (cherry picked from commit 0306d30ad73dc06474597ac489acf5eb8a447a10)