Merge "tempest cleanup fix return code"