Update 5.8.0-HF04-SNAPSHOT to 5.8.0-HF05-SNAPSHOT