synced with hermes korous-devel