Merge branch 'fc/completion-updates' into maint