Merge remote-tracking branch 'public/pr/2352' into development-psa