WIP: Master2

Open kklin4 requested to merge master2 into master

Merge request reports