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

* origin/branch-4.5:
  Refactor KeyValueFormat
  Reduce complexity