Upgrade to v3.16.1-geek