Wording changes, Process changes, fixes #6674 fixes #6675
Wording changes, Process changes, fixes #6674 fixes #6675
Merge branch 'dev' into test