Merge branch 'enc_cleanup_core_enc_fixes' into 'main'

Updates to core encoder and float structure elements cleanup

See merge request !798