Added notDeletable DCA configuration (#16)
Merge branch '2.11' into 3.0