WELD-1791 Align with latest Weld SPI SNAPSHOT