Imported all changes from upstream