Merge release candidate of v2.6.1 to production

Merged Konstantinos Platis requested to merge rc-v2.6.1 into master

Merge request reports