Fixed for compatibility with the final release of Metal
Merge branch 'master' into plus