Merge "Resolved policy sidepanel"