Merge "Refactor code to allow B&R logging" into main