Added changes according to master branch after merging
'MergingNodes' patch.