Add comment-dwim-2
Merge pull request #2009 from remyferre/add-comment-dwim-2

Add comment-dwim-2