First commit for FDSU-745 ; fixes for FDSU-783

Merge request reports

Loading