Draft: Merge dev to master

Open aso requested to merge dev into master

Merge request reports