Changes from upstream to master