Merge branch 'dnp/source_feature_optional'