Merge "Switch to using kati env script"