Merge "BUG-4565: queue stats error"