Merged this with upstream too