Artifacts of tm-3.5-maintenance #18