4335 pull from staging

what happens if this raises an `AssertionError`? we probably want to make sure this isn't blocking