Merge branch 'fix/delete-before-activate-completes' into 'develop'

fix: defer deactivate when DELETE arrives before activate completes

See merge request !57