some bugfixes from 12.2.2 into master

Merge request reports

Loading