Merge branch 'js/maint-am-skip-performance-regression' into maint