Rephrase terms to avoid miss-interpretation
Merge branch 'refs/heads/master' into production