zit-3276_1
Merge branch 'zit-3276'
new version res 41.599
change export NN
destroy elGrid
Merge branch 'zit3264' into dev