Imported recent changes of kornakapi to orp-kornakapi