(cherry picked from commit 653dae18c8c473aa8f56ffdf8fbc87d1de265068)
(cherry picked from commit 39f9c5e889d82ad07f4158b20d93921596c82694)