Merge "Bug 1585 - switch features removed after node updated"