Merge develop into 2.6.X for release of 2.6.3

Merge request reports

Loading