Merge from upstream (hotemup)