Merge "[CDM][Refactoring 5/N] Update CDM feature checks" into main