Document review from Chris
Merge with upstream