Merge "Generic Neighbor Configuration dg - Bug Fix"