[PRQ#53736] Merge Request for xavs-svn