Merge branch 'tr/maint-merge-ours-clarification' (early part)