fixes #7551
Merge branch 'dev' into test