(cherry picked from commit dd050420) (cherry picked from commit 4804ce14)
mentioned in commit 785af6f9
mentioned in commit 6ab20e9f