Inventory can be closed with escape key
Merge commit 'b820623' into develop