Update SDK v0.9.4 + Fix by PV