v0.9.4 upgrade