Skip to content

Fixes batch2

HJ requested to merge fixes-batch2 into develop

Fixes #1351 (closed) and #1350 (closed) as well as other stuff I found

Merge request reports