Semi-final commit for the configuration tool.