Update RC w/ version 2.6.0

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

Merge request reports