fix: defer deactivate when DELETE arrives before activate completes

George Papathanailrequested to merge
fix/delete-before-activate-completes into develop

Merge request reports