KRACOEUS-8372 : Save custom data with arg value lookups
Merge pull request #1143 from geothomasp/customdataargvalsavefix

KRACOEUS-8372 : Save custom data with arg value lookups