[No reviewer] Upgrade 5.10

Fixes #4