branching: merge default into stable

Raphaël Gomèsrequested to merge
topic/stable/branching into branch/stable

Merge request reports