Restored FeaturePipeline from dev branch