Stability fixes

Merged Administrator requested to merge gh-11ed8592/40/unknown/master into master

Merge request reports