Initial import of v1.0 of the upstream module