Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint