TS-2950: Merge libck master (0.4.3-3-gc4e4702)