Update to JSON structure. The historical page still requires an update.
Merge remote-tracking branch 'origin' into version_bug