v2.5.0.beta7: 802d74bab2ebe19a106f75275342dc2e9cc6066a