Merge "Adapt requirement number to match CDD." into rvc-dev