Code

Merge branch 'jc/fix-add-u-unmerged' into maint