Merge branch 'crypt' into next