Merging COGS type fix from master

--HG--
branch : 1.4