Merge branch 'bug/JAL-3973_source_tarball_not_building' into develop