[v6r11] New DataManager

PR with resolved conflicts, superceeds #1826