Merge "Make states atomic and update comments" into sc-dev