Merge "Add content handling support to B&R" into main