ISPN-3234 Temporary, upgrading to 0.8...