multitenancy changes[moving some functinality from child to parent]