- Fix merchant inventories not closing on entity removal (#6544)