Aligned with latest transfuse core