Merge "Refactor DocumentHolder."