Merge branch 'bug/JAL-797' into develop