Merge Katat changes