Merge branch 'JAL-1040_jar_manifest_fix' into develop