tosem: Pseudo-stable checkpoint to merge into main tree