Merge version 2.6.12 into master

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

Merge request reports