Merge "Stop location to avoid timing issue (VTS 2.0)" into rvc-dev