BF: Backport fix for scaled data from enh-arbitrary-dimensions branch.