Merge "New ConditionManager"