ARQ-1071: Replaced ThreadLocal with InheritableThreadLocal