merge from kvakvs