Note: This update needs critcl>=3.3 (updated in the previous commit), otherwise accelerators won't be built.