Merge branch 'enc_float_code_cleanup_mld_improvements' into 'main'

Encoder and common float code clean up, high mld fixes

See merge request !867