Merge of KovuUtils and VazCore