(cherry picked from commit a303113b5ba87a549f4f5f335c2b65354a0eeba0)
(cherry picked from commit 3bfecfeb9be6ca28d7c006d76abed451a5b7bf22)