add lock around adding iterator
Merge branch 'master' into parent-child-docs