Merge "Separating renderers into features."