Merge pull request #2354 from rpv-tomsk/issue-2344-nut-rework