# cherry-picked commits. Keep in upstream's chronological order

# patches for upstream