(cherry picked from commit 594f7922f9b8f18612add59e2a60aed33ce337fd)
(cherry picked from commit 08b3107d92a5522bf3374fb6ae01618cd3588b69)