[PATCH v2 0/3] Codec workaround