Upgrade to Cog r.3018