Merge branch 'ap/maint-merge-strategy-list-fix' into maint