proxy nodes fixes

Change-Id: I51b1f9812bae255421d1df1d63fb7ae7c601055d
7 files changed