[PRQ#37507] Merge Request for latestspigot Accepted