Merge "Fix EventConditionProvider for secondary users (and HSUM)" into main