Merge "Add command line strictness to VTS" into oc-dev