Added bfs patches for 3.5.x