Merge "Fix tempest cleanup"