[PRQ#51302] Merge Request for query-master Accepted