Upstream fixes

- Temporarily disabled 'play' functions