Upgrade weld-parent to 31