Merge branch 'bug/JAL-689' into develop