Fixes #4745 and Fixes #6593 peaceful tokens!
Merge branch 'dev' into test