Merge "Fix multiworker changes"