Merge branch 'bugfix/JAL-1239' into develop