Update 5.8 to 5.8.0-HF02-SNAPSHOT