Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop