Update for FindsByNested + FindsByChained merge