Merge "Move code from SuggestionChecks to FeatureProvider"