merge: CTCaer Kernel v2.7-v2.8 changes