* commit 'f7c60a05bf610ad9cb6914a296dfebb72f1ad2c5': Fix cleanup race condition where objects might may not be cleaned up correctly.
* commit 'f7c60a05bf610ad9cb6914a296dfebb72f1ad2c5': Fix cleanup race condition where objects might may not be cleaned up correctly.