Increase robustness of submission saving when jpg files are submitted
Merge branch 'hotfix/1.3.4'