Merge branch 'staging'
fix staging config
minor fix