Merge pull request #35138 from s-aga-r/FIX-ISS-23-24-00368

fix: recalculate costs in SCR while reposting