Upstream v1.1.0 prep