Merge branch 'bug/JAL-2578' into develop