Merge branch 'high_mld_fixes_enc_1' into 'main'

Fix for high MLD cases for OMASA format, bug fixes related to scaling

See merge request !918