Merge branch '1121-ivasmasaformatdescriptor-defined-at-three-different-files' into 'main'
Resolve "'ivasmasaFormatDescriptor' defined at three different files" See merge request !1649
Resolve "'ivasmasaFormatDescriptor' defined at three different files" See merge request !1649