Merge branch 'jc/apply-ignore-whitespace' into maint