search UI passed
Fix god mode
Merge branch 'dev' into AccessControl