Merge branch 'gb/apply-comment-typofix'