a bit more smoke test cleanup
Merge branch '1.12'