Merge branch 'gb/apply-ignore-whitespace'