Merge branch 'js/t3404-indent-fix'