[Fixes#8197130]