Fixed issue with general item type array

Fixed the order and added an error element to the array.
Merge remote-tracking branch 'origin/master' into JohnDev-Branch
Merge remote-tracking branch 'origin/master' into JohnDev-Branch
Merge remote-tracking branch 'origin/master' into JohnDev-Branch