Merge "Add the ability to enable and disable supervision" into main