Update 5.8.0-HF21-SNAPSHOT to 5.8.0-HF22-SNAPSHOT