Removed keyvalue11 and keyvaluem1
Merge branch 'feature-#2'