[PRQ#63661] Merge Request for discover-snap-6