Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I614752836e568436006196bb909d89c2655199dd