Merge branch 'feature_extraction_embargo'