Merge branch 'jc/apply-ws-fix-tab-in-indent'