Bring in latest version from CircuitCo