Dont store in DB by default
Merge branch 'enum_ad_perf' into enum_ad_users