Merge "BUG-2596 Workaround for scheduled-threadpool module"