Enforce the type of nestingDepth
Fix for review
Merging #2229 polyglot tests should wait for index

Putting an index_wait in wherever we create an index then try to use it. The review for this 1514.
Remove reference to undefined
Merge branch 'michel_2384_expr' into next
Merge branch 'next' into sam_2353