Merge branch 'bug/JAL-2321_merged' into develop