Updated for 1.44.0