Merge branch 'feature/JAL-2488finalize' into develop