(cherry picked from commit 556a7bbe) (cherry picked from commit 76331f86) (cherry picked from commit 6cf2ec5d)
mentioned in commit ba6cce0a