Merge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao...