(cherry picked from commit 1fdfca4d) (cherry picked from commit 18babc7b)
mentioned in commit 15ccdae7