Temp fix for Test environment
Merge branch 'master' of https://github.com/robertsoniv/Redemption