[weld-issues] [JBoss JIRA] (WELD-1707) Backport WELD-1651 to 1.1.x branch