Merge from master to main

Christopher Schmidt requested to merge master into main

Merge request reports