(cherry picked from commit 5a6f5b64)
(cherry picked from commit 8b6108a8)
(cherry picked from commit 8f00c9c7)