CORE-4031: added two new options for tool architectures