(cherry picked from commit 110db1a40b84b9a5ad2590233ee3f03eeae2ec78) (cherry picked from commit 52719937ad971b9ae25148a0e57a8ec3e94dc146)
