Update to latest Perpetuity master