Merge commit '0197a704b0988b6e27db4ec00515cdc65a02c70f'
Merge commit '01586664ad6a11977026a59b6a656588bd4bea16' as 'externals/mp'