It is necessary for nuclear power plant operation and spent fuel canisters to provide a sound technical basis for the safety and security of long-term operation and storage respectively. A new code case for mitigation of Primary Water Stress Corrosion Cracking (PWSCC) and Chloride Induced Stress Corrosion Cracking (CISCC) in Section III components by using an advanced surface stress improvement technology (ASSIT) is being developed by Task Group ASSIT which is one of the task groups under the ASME (The American Society of Mechanical Engineers). The necessary technical reports supporting this code case are being developed as part of joint research projects conducted by Doosan Heavy Industries and Construction (DOOSAN), Electric Power Research Institute (EPRI) and Sun Moon University (SMU). A well-known approach to prevent PWSCC and CISCC are to be performed using materials resistant to PWSCC and CISCC. The objective is to eliminate residual tensile stresses, or to induce compressive residual stress using ASSIT methods such as laser peening, water jet/cavitation peening, ultrasonic peening and ultrasonic nanocrystal surface modification (UNSM). Performance and measurement criteria for mitigation of PWSCC by ASSIT will be established based on the magnitude of surface stress and depth of compressive residual stress, sustainability, inspectability and lack of adverse effects. Additionally, for mitigation of CISCC by ASSIT, the evaluation of chloride induced corrosion pitting, the depth and density of corrosion pits and stress corrosion crack initiation and growth under chloride salt chemistry conditions are also being examined. This paper explains the approach, and progress of testing and analysis. The results and details from testing and analysis will be presented in a future PVP paper upon completion.