Issue #2256321, by mv1st: Nodes need to be resaved.
Merge branch 'refactoring' into 7.x-2.x