update master to Releases/2.9

merge some bugfixes and cleanup from releases/2.9 into master

Merge request reports

Loading