Merge branch 'ks/t7508-indent-fix'