Cleanup

Mikhail Svechnikovrequested to merge
m.0 into main

Resolves #1089 (closed)

Resolves #782 (closed)

Merge request reports