cherry-picking scope changes
Fix to jpanel link issue