Merge branch 'stable-3.0'

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

Change-Id: I3296e63483ae7ba643e5ab491f58450e9c117a13