Merge, new queue, rid lost fix, sample size fix, etc