Merge branch 'as/maint-completion-set-u-fix'