[PRQ#64252] Merge Request for psa-update