Upgrade to 7.24