Merge branch 'task/JAL-3247_Install4j_improvements' into develop