Merge "Add parameter for including supplemental data" into rvc-dev