(cherry picked from commit 42826a89) (cherry picked from commit 3ea15740) (cherry picked from commit 30d4f0ce)
mentioned in commit 9671c013
mentioned in commit 4e5616fc
mentioned in commit d5d50c6a