Merge branch 'js/use-sc-open-max' into maint