Merge "Clean up usage of FileLog, and some logging related to B&R" into main