Merge "Add instruction to clear restriction after test" into rvc-dev