Merge version 2.6.9 into master

Merge request reports

Loading