merging changes from CKII 2.2