Merge "Fix problem with unencoded data in URI sent to EAS"