Update 5.8.0-HF17-SNAPSHOT to 5.8.0-HF18-SNAPSHOT