ORVSD 107235 per Kimbers request
Merge remote branch 'upstream/master'