Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev