Merge branch 'JAL-1254-hotfix' into develop