(cherry picked from commit fb906b00) (cherry picked from commit 2aefb7be)
mentioned in commit 69b747dd