Merge branch 'dev' into Developer-Utilities
Godmode used constants instead of hardcoded values.
Merge branch 'Developer-Utilities' into dev