Fixed inventory render + version bump
Merge remote-tracking branch 'origin/17' into 17