Merge changes in upstream

Removed some non-working features