(cherry picked from commit 12752f0c)
mentioned in commit d30f345b
mentioned in commit 42c71a93
mentioned in commit 91d16fd9