Upgrade to wangana v2.6