Small fixes from Fujitsu branch

Merge request reports

Loading