Issue #8475 by turegjorup