[DF-4105] Fixes with baking hierarchical entities.