DS-5671 by serhiy-chornobay, ronaldtebrake: make sure the photo orientation also works in 8x3x branches