Moved KAMI research. Ready for 2.2.1 test build