Wip 7659

Do not merge yet.