Import changes from latest QA upload

Felipe Satelerrequested to merge
import-changes into master

The git repository was based on the last maintainer branch, but there was a QA upload that was not included. Lets include those changes.

Merge request reports