Port missing features from release-7.3 branch

Merge request reports

Loading