Fix to the export issue with md5 / sha1 fixes #237
Merge branch 'hotfix-2.2.17' into develop