GPII-20: Did last updates required for it to work with Kettle