Fixes for 6.0 beta version

Merge request reports

Loading