Merge branch 'ab/rebase-test-fix'