fixes a bug in godmode
fixes test cases
Merge branch 'dev' into 72753072