Merge branch 'enc_bug_fixes_cpe_classifier' into 'main'

Encoder bug fixes in cpe_enc, classifier

See merge request !919