FLUID-5460: Handle copying of images explicitly