1. f7c5655 OSPF protocol manual merge from 1.6, due to cherry pick merge conflict by sunishvk ยท 8 years ago