Update nanliu/staging to v0.4.0