[DF-3966] base changes in image helpers