Merge pull request #14101 from annando/self-this