Changes from legal
Merge pull request #1807 from zz9pzza/issue_4080_2

Changes from legal (tos_faq)