(cherry picked from commit 0f95921447ea547bdf9caf18f7fde46bc66031f8) (cherry picked from commit 487d9b0f3f40a1f1afbcb3cc7b760982131b4902)