Update to CPK 7.0.11 and drop monkey patch