prepare migration to 8.0

continue the work started in #4