Merge branch 'jk/rebase-i-comment-char'