Merge "Fix roots filtering for move operations." into nyc-dev