Merge "Make testing jobs easier." into rvc-dev