Fixes #6656
Fixes #6645
Fixes #6644