branching: merge default into stable

10 jobs for topic/stable/branching-6.2 in 39 minutes and 11 seconds (queued for 4 seconds)