Inv item dev

Merged pull request with Jonny—also sending branch updates to main