fixes #6508 it works, although unfortunately not with automated tests
Merge remote-tracking branch 'origin/master'