Similar to: 29c09c76 Planned follow-up is to add a transform here to allow removing a common shift fold that is conflicting with D110170.