Merge in Weld 2.2.7 final