Fixes #8614
Merge branch 'issues/8614' into develop