Merge ASN1 branch to trunk
Fix for 3683 (cont) Add SubtreeDeleteControl forgotten with previous commit