(cherry picked from commit b19ec331)
mentioned in commit e6678e5c
mentioned in commit 2647a2c0
mentioned in commit 2edbe91a
mentioned in commit eb60cccc