Merge "makes renderer ignore controller-config"