Merge "Added eventSchemaVersion for async schema"