Merge "Fix typo cpu6 -> cpu7"