Merge branch 'jc/update-list-references-to-lore' into maint-2.42