Upgrade to v3.16.2-geek