Fixing autodelete bug.
Merge commit '180a768e048165ac0d33202c84baa6ead9dcf3d6'