Merge branch 'tb/make-indent-conditional-with-non-spaces'