Merge branch 'hotfix/JAL-1524' into develop