Merge branch 'mld_fixes_omasa_files_jbm_dec' into 'main'

Sclaings updated in jbm_dec, fix for warnings from gcc-11

See merge request !544