Merge "[Enterprise] Fix hasEnterpriseConfigChanged method" into rvc-qpr-dev