Send image_id and prodstates to applyDataMap, and remove nested transact...

...ion

fixes 16052-23376