Merge "Enable secondary user to update controller status"