Manually transferred changes from 483

Merge request reports

Loading