Sync036

Merged Alan Braz requested to merge sync036 into master

Merge request reports