[merge second] Version bump 0.5.4