Added CPS and trampoline solution for 2.29.