Merge branch 'feature/JAL-3143ensemblJSON' into