Merge Tim_bgc into main after locally solved merge conflicts
requested review from @sgu
assigned to @sgu
merged
mentioned in commit c28c8726