Merge branch 'ap/rebase-multiple-fixups'