Merge branch 'develop' into lbudginas/#552_change_default_node