Merge branch 'feature/JAL-2611' into develop