[non-BE][split-non-BE] [Resolve "harmonize output scaling in combined formats" See merge request !2184