fixed race condition
Merge branch 'secunload' into testing