[PRQ#53737] Merge Request for xavs-svn