[#2840] Minor tweaks to new orientation Image validation constraints