Sync from upstream four

Merged Pablo Javier Aravena Núñez requested to merge syncFromUpstreamFour into master

last sync that will be made from the upstream branch

Merge request reports