task #00020-Node_view: Minor fix
Merge branch '00020-Node_view' into develop