Upgrade to INDI 0.9.9