Update 5.8.0-HF12-SNAPSHOT to 5.8.0-HF13-SNAPSHOT