Merge branch 'js/clean-report-too-long-a-path' into maint