Merge Metro branch

Merge Metro branch to add in Spout compatibility.