[PRQ#40259] Merge Request for tray-control