4.0 stable

Fabrício Ceschinrequested to merge
rc into master

Merge request reports