(cherry picked from commit 4c30a2e9) (cherry picked from commit afad7c2925ee52d1efa8f98fe7d5a30167e698f3)