Fixes #6725
Fixes #6724
Fixes #6705
Fixes #6704