Added data management to implementation of ticket #471
Authored by: numere 2021-01-23
Parent: [r820]
Child: [r822]