Update RC-v2.6.0 w/ latest version of master

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

Merge request reports