Merge branch 'ic/maint-rebase-i-abort' into maint