Align on 1.2.1-SNAPHOST 5.8.0-HF17-SNAPSHOT