merge fixes

Merged Roberto José TORO OLMEDO requested to merge github/fork/r03ert0/master into master

Created by: r03ert0

Merge request reports