Add node filter

Closes-Bug: #1302022
Change-Id: I09127cbc689f4f0dab9a03dcf939a067828ceaa2
Merge "Add node filter"