(cherry picked from commit 42826a89) (cherry picked from commit 3ea15740)
mentioned in commit d5d19e5e
mentioned in commit 9671c013
mentioned in commit 4e5616fc
mentioned in commit d5d50c6a
mentioned in commit 5a7c211d