Fixed issue with app-config
Merge branch 'refs/heads/mongo'