Merge branch 'rb/nonstop-lacks-uncompress2'