adding BFS 316 to 318 patch