Merge branch 'nd/status-auto-comment-char'