Merge "BgpManager commit for code refactoring & bug fixes"