[QE-1024] More work around cleanup thread