Bundle 17.0-h-46448-rov-fix

Version	17.0
Branches	ingadhoc/enterprise-extensions 17.0-h-46448-rov-fix_20-12 ingadhoc/enterprise-extensions 613