fixes #7776 update error text
Merge branch 'dev' into test