Merge remote-tracking branch 'origin/development' into development
* Small fix for item id validation