Merge branch 'feature/JAL-1379' into develop