WELD-1629 Implement CDI-331