[DF-3791] Fix export and save with children