Merge "Parses package/provider with non-configuration strings" into rvc-dev