merge CQU changes and relable PPN to CPUs for CQU