Support/2.6.x

Merged Arnaud Pauget requested to merge Support/2.6.X into master

Merge request reports