Move 7.1.0.1 to it's own case, alignment cleanup