ItemEditor fix
Merge branch 'ItemEdtor'