Merge pull request #3740 from rabuzarus/20170927_-_add_comment