Merge branch 'js/format-2047' into maint