reverting #6243, fixes #7458
Merge branch 'dev' into test