(cherry picked from commit dd050420) (cherry picked from commit 4804ce14) (cherry picked from commit 4db76e17)
mentioned in commit 785af6f9