CLC-2709 Fix threadsafe deprecation