Reduce complexity
Merge branch 'reduce-complexity-keyvalueformat' into branch-4.5
Refactor KeyValueFormat