[seam-commits] [forge/core] 490127: FORGE-537: Applied Gernot P proposed fix