Merge 4.3 into master

Closed Julien Wadel requested to merge fix/merge_master into master

Merge request reports