Wip 7659

Commits are ready but final testing is pending.