Merge branch 'fc/completion'