Merge from erpreciso

It's kind of fun: please merge this, @casey-collab