Merge "add support for thread-local objects with destructors"