Merge branch 'high_mld_fixes_Q_info_updates_1' into 'main'

Fix for high MLD cases for MASA and OMASA formats, Q-info updates

See merge request !925