Changes for all the late feedback of pull request 8720.