Update 5.8.0-HF03-SNAPSHOT to 5.8.0-HF04-SNAPSHOT