fix teardown to be static
Merge branch '1.12'