Merge "Add testcases for external data storage" into rvc-dev