Merge "cpu: add support for Demeter CPU" into integration