Merge "Fix Kati dependencies"