WIP multi-rev. Bring over matthewfl changes.