Danciul master patch 06877

Merged laurentiu requested to merge danciul-master-patch-06877 into master

Merge request reports