Merge "Enhancement of tempest cleanup documentation"