Merge "Allow more error codes while trying to use incorrect APPLICATION_ID/APPLICATION_DATA." into main