Test Fixes for live production
Revert "Test Fixes for live production"

This reverts commit 254120159d3d6938e899b7ca9cef42aae598dba8.
Merge branch 'dev' into feature/basic-tier