(cherry picked from commit dd47b252) (cherry picked from commit 122945f3)
mentioned in commit c8033646
mentioned in commit 436872f9