Sync codec_zap with the one that is in the 1.4 branch so that it can actually