Merge branch 'high_mld_fixes_code_cleanup' into 'main'

High mld fixes for masa format, acelp Q-corrections and code cleanup

See merge request !983