Merge "Additional work on new Event upload to EAS server"