Merge "Use separate feature_support library"