Merge "northbound: code clean up"