EZP-20831: s/imageVariationId/imageId/g