Merge branch 'feature/JAL-2745ebiHttps' into develop