branching: merge stable into default

11 jobs for topic/default/branching in 41 minutes and 17 seconds (queued for 3 seconds)