Update 5.8.0-HF15-SNAPSHOT to 5.8.0-HF16-SNAPSHOT