is_dfs_admin() returns true for users ids 1 and 53
Merge origin/master