Fixing merge from upstream