merge: knemo #77