Merge "Protect invalid entitlement app configuration" into rvc-dev