Merge branch 'aw/rebase-i-p' into maint