Merge branch 'hotfix/JAL-1530' into develop