Merge pull request #25857 from Anuja-pawar/fix-ageing-error-pre-release

fix: ageing error in PSOA