Merge Release Candidate of v2.6.4 to master

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

Merge request reports