Fixes node collection management

Closes-Bug: #1283001

Change-Id: I540baafaeed894a0878a2122631f19963ea6c4e8
Merge "Fixes node collection management"