Merge remote-tracking branch 'origin/features/JAL-1705_ensembl' into