Upgrade to WPT 2.10