Additional SQL for admin security
Merge remote-tracking branch 'upstream-DemoSite/admin3' into develop