Combine develop with main

Dom Sekotillrequested to merge
develop into main

Maintaining develop has little value.

Merge request reports