Upgraded to Weld 2.0.0.CR4