Upstream update: v1.0.1