enabled concierge
Merge branch 'hotfix/concierge'