Merge "refactor(cpus): use BIT macro in a consistent manner" into integration