Merge branch 'jc/apply-trailing-blank-removal'