Merge branch 'bug/JAL-1803_JAL-2157' into develop