These patches have been merged into official package