Merge "Fix #37305009 : Beam crash in secondary users" into oc-dev