Eng 6979 json index limit

I'm looking for review on the last commit -- the others are just merged from master.