merged vso changes