Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1