(cherry picked from commit af3a690427169763749987475727b0e37a6b6211)

(cherry picked from commit 405a83cda0fc0f45cd4851bed7cc1d525f6d8fa4)

(cherry picked from commit 4b2e143fa82231ecf563a8cb133edcc0839b4e1f)

(cherry picked from commit de9a7b4f9a61257dff5880b6543f79c13c502aad)

(cherry picked from commit f23389df0f358ec05ed0483a91cd4cfc56f867a5)