is_machine_admin flag for users
Merge branch 'enhancements'