Merged from katana