Merge branch 'ib/rebase-reschedule-doc' into maint-2.43