Merge pull request #8915 from annando/store-on-comment