acu171605 fix whitespace
Merge branch 'sapphire_14_12_acu171605_more_whitespace_substitution'