Bug fixes from the previous release

Merge request reports

Loading