nginx conf bug fixes
Merge branch 'feature/be-test' into develop