merge from stable branch 5.0