(cherry picked from commit 94673d41) (cherry picked from commit f13a2942)
mentioned in commit dbcbe97b
mentioned in commit c4eda540
mentioned in commit 45d54ea3
mentioned in commit 4fdff7d3