Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Refactor json handling for simplicity and maintainability

Change-Id: Ia02a8956a9f004422a1c5292a5c7ea745d3166f6