[PATCH-next 0/5] Remaining phase 3 port