Bring changes from upstream

Let's bring in latest changes. What could possibly go wrong?