Align package on 5.7.1