COMP: Added option to enable BGQ specific code