Syncing up to latest commit with simulator BFS changes.