Update 5.8.0-HF24-SNAPSHOT to 5.8.0-HF25-SNAPSHOT