Merge "Reduce OMS start time" into rvc-dev