Merged from knm