(cherry picked from commit 15da856303e5abf2f1ad00d2d227568af985a532)
(cherry picked from commit 8536ecb6111d2cf189381970fd007d7be0e8c0b4)