Upgrade to 3.12.5