Merge "[Multi-user] Decouple UserBMS and BMS creation"