Merge branch 'admin_fixes' into cisco_changes