Merge "Making VMS a @SystemAPI"