Merge branch 'features/JAL-1793VCF' into spikes/mungo