[PATCH-next v2 00/12] Generic code fixes and partial phase 3 port