Issue/1780 image upload order