Fixed issue with loading local items.json
Merge remote-tracking branch 'origin/develop'