Merge "fix(cpus): fix clang compilation issue" into integration