v2.5.4.1 (same as 2.5.4 + ply loading bug fix)