Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev