(cherry picked from commit 797bc86a2b419bdde63e2fa88afd43e6d48af334)
(cherry picked from commit 22ef97f3aa9e83d11878c437dcccb8970660b891)