Fixing how the image split works
Merge branch 'develop'