Merge "Inventory manager: get rid of synchronized blocks"