Merge "Fixed removals from data store did not clean direct-match indexes to child...