Fixes inventory issues
version 0.35.11
Merge branch 'dev'