[weld-issues] [JBoss JIRA] (WELD-1687) Backport WELD-1683 and WELD-1550 to 1.1.17 branch