Product images refactor [deliver #83027286]