Merge branch 'nd/list-merge-strategy' into maint