Merge pull request #1016 from MrPetovan/bug/9172-qcomment-fix