Merge "Replace data source with data reader" into rvc-dev