(cherry picked from commit bd89d035) (cherry picked from commit ef677436)
mentioned in commit 323cdf4d