(cherry picked from commit 84ced330) (cherry picked from commit 664529ef)
mentioned in commit 39a53d4f
mentioned in commit aaad9788