Merge into 'data_fusion/mojor_refactoring'. Completes refactoring of
Data Fusion.