Merge remote-tracking branch 'upstream/develop' into feature/add-nodes-tab-ui