Merge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev