Added debug settings
Merge branch 'hotfix/debug-settings' into develop
Merged debug settings into live