ref #6694 Fix session handling when moving feature nodes