merge from kojsmn