(cherry picked from commit 1d0a682)
(cherry picked from commit df48cda)
(cherry picked from commit f87ac4d)