(cherry picked from commit 7161b71265c13afc9b7cc61cef472f6af00a342b)
(cherry picked from commit ffc82fa01c6b212e79475dc7d9fc1ddc17141f36)