Merge this PR into our fork