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