[PRQ#49376] Merge Request for choqok