Itembug

Corresponding dev pull request for #461