Add a spinner while creating a machine
Merge branch 'staging' into rules_refac