- Add incremental remove support
hack to work around the uuid issue that won't break assembly until fixed properly upstream (bz567132)
of bug fixes we need