4 Commits (revert-864-fix-destroy)