main #2

Closed
potzplitz wants to merge 2 commits from main into release

2 commits