(cherry picked from commit 64fba310) (cherry picked from commit b35707a9)
mentioned in commit 071cad25
mentioned in commit 895eec84
mentioned in commit 61bc5973
mentioned in commit 7f072dfc