Merge changes from topic "vkjson_fix" into main

* changes:
  Fix nullpointer dereference at VKJson
  Update vkjson codegen