Merged Kate changes