Merge "Use Version-2 feature-support-utility API"