Merge branch 'hotfix/JAL-1521' into develop