Merge "Address follow-up comments for UMO in hub mode" into main