Merge "Add api_v2_admin flag"