Lock kafe 2.1.1
Merge commit '4f01538a15ee2546dafdc516e2f8282881c0c29d' into v3