task #00020-Node_view: Features update
Merge branch '00020-Node_view' into develop