Merge origin/master into sofia6_revision
Merge remote-tracking branch 'origin/sofia6_revision'