AIMS-64 bugfix, catches invalid shelf code.
Merge branch 'tray-stocking' into staging