Merge branch 'pw/rebase-i-regression-fix-tests' into maint