the solution of TESB-10959 for sam-agent (updated)