Fix some bugs
Merge from Perforce
Merge branch 'bug/lldp'