(cherry picked from commit 2eee65e1) (cherry picked from commit 3f7b718f)
mentioned in commit 891392b9
mentioned in commit 4ff8137a
mentioned in commit 00fffb78
mentioned in commit 677c2c55