Fix E_NOTICEs in the rewritten CFB mode
Merge remote-tracking branch 'origin/petrich'