(cherry picked from commit b56f6d6a) (cherry picked from commit 9905d575)
mentioned in commit c81385ab