Merge branch 'jc/add-u-A-default-to-top' into maint