Merge branch 'feature/JAL-2759' into merge/JAL-2759_2104