Manually merge of #840 and #841
Merge pull request #854 from garcia-jj/ot-docsmergingfrom840and841

Fixing texts from pull requests #840 and #841