Merge branch 'js/rebase-merges-exec-fix'