[PRQ#80084] Merge Request for yasp