It seems only the LazyHttpConversationContextImpl is affected because it overrides deactivate() and does not call super.deactivate() where the cleanup takes place. Previously, the first part of the cleanup was held in the deactivate() method and the other part in the cleanup() method. I will leave the cleanup logic in deactivate() (as it's part of the Weld API) and fix the conversation context.

P.S. The thread-local variable is a small object with two boolean fields and no sensitive data, so the impact shouldn't be large.