Pull in / reconcile all PRs for #314

Incorporates / supersedes:
- #340
- #341
- #342
- #343 (fixes up)
- #344
- #345
- #346

Implements #314.
Consider rename to reduce confusion:
```python
patched_entry = entry.copy()
```