Merge "Fix cleanup stale stacks job"