Merge pull request #9027 from JosephTremoulet/Comment