Merge "Handle SSM thread failures better"