Merge "Active Discovery Resource Type Filtering - C SDK & App Changes only."