(cherry picked from commit 45b156c1) (cherry picked from commit 42fab2d4) (cherry picked from commit 2d0e3919)
mentioned in commit f22b83e0