[PATCH 0/2] Fix equence collision with neighbour notification, and one nit