branching: merge stable into default

11 jobs for topic/default/branching in 32 minutes and 7 seconds (queued for 4 seconds)