Upgrade Weld Parent to 31