Minor update to terms.
Merge conflicts.
Minor update to terms.