Merge "refactor(cpu): update IP names of Makalu CPU lib" into integration