[a16752c252] Correct failure to call cmd deletion callbacks.
[a16752c252] Correct failure to call cmd deletion callbacks.
merge trunk