Sync with latest Cisco plugin changes.