(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)