Wip 7676

Fixes for issue #7676