(cherry picked from commit b1e0c313) (cherry picked from commit 34882192)
mentioned in commit 11191d10
mentioned in commit b4ef19bf
mentioned in commit 82977e52
mentioned in commit afabf77c