Merge "Add script to fix content model of JSON pages"