SIGN IN SIGN UP

Merge pull request #7775 from LK4D4/merge_state_lock

Merge Container and State mutexes
V
Victor Vieux committed
280b64bc7baf3cff48eb2f07330d693eebfaaee7