Merge from stable.