merge stable into default

Pierre-Yves Davidrequested to merge
topic/default/branching into branch/default

The merge a bit complicated, I want CI on it.

Merge request reports