update version v2.5.4
Merge branch 'release/v2.5.4' into develop