Rewrite

tokar requested to merge rewrite into master

Merge request reports