[PATCH-next 00/12] Code fixes and partial phase 3 port