Update to match delivery of 0.3