V1.81.0 compatibillity (#10400)