Merge branch 'mm/status-without-comment-char'