Fixes #6732
Fixes #6731
Fixes #6728
Fixes #6727
Fixes #6726
Possible fix for #6729