Merge "Rework topk panels implementation"