(cherry picked from commit 0f849d0a) (cherry picked from commit e42f9add) (cherry picked from commit f1d740fd)
mentioned in commit 741c8b76