Updated for 0.44.06