Upgrade Q to v0.9.6