Backport 6660 stable6

:construction: