Merge branch 'bug/JAL-3075' into develop