Now pictures are in great order
Merge branch 'develop' into staging