Merge branch 'T25688-Render-window-manager-with-custom-multi-widget-beta'
Fixed merge conflicts that arose because part of this merge was already
added to the master and modified later (e.g. data node context menu and
actions, changes in the render window manager (ui), ...).