Bug fix

Merged s80527 requested to merge bug-fix into master

Merge request reports