Apply changes from upstream-ready branch