(cherry picked from commit b12440d3479f19138bc66ea59baf41eb89061906) (cherry picked from commit 6c69e23dcdf1cdbddd47bacdf2dace5c9f06e3ad)
(cherry picked from commit b12440d3479f19138bc66ea59baf41eb89061906) (cherry picked from commit 6c69e23dcdf1cdbddd47bacdf2dace5c9f06e3ad)