Merge branch 'khw/invlist' into blead