Merge "Update vkjson" into main