Merge remote branch 'mfournier/varnish-data-reorg'