Merge "Cleaner VTS for wider use" into oc-dr1-dev