Merge "Delete ThreadLocalStorage on shutdown" into devel/master