Finish i68
Merge branch 'i68' into wip