[#398] Fix delete org
Merge branch 'master' into 398-delete-org-fix
Merge branch '398-delete-org-fix'