Merge "Change to fix SQLInvalidAuthorizationSpecException"