Merge changes into beta

Merge request reports

Loading