(cherry picked from commit 556a7bbe) (cherry picked from commit 76331f86)
mentioned in commit ba6cce0a
mentioned in commit da0cc77b