Finish i70
Merge branch 'i70' into wip