Roll-up of updates for 0.6-2. extractAux, readModels fix, etc.