Merge "Use config generator rc instead of wrapper script"