Merge "flexibility for having extra policy files" into rvc-dev