Update rejected messages wording, fixes #6596
Merge branch 'dev' into test