Steve Millidge Could you please verify that https://github.com/weld/core/pull/1604 solves your problem?