Merge commit '1925d4dcc65df310c7a6677ff2e9520c002fc031' into HEAD
Merge commit '7b0c47d3f0c20eeeceb0324771eb86ab80b0bd86' as 'externals/mp'