align on 5.8.0-HF06-SNAPSHOT