Merge branch 'amf/3VFN0_update_source_features'