bug fix in intrinsic scaling and initial support for intrinsic scaling in multi-calibrate
enabled an automatic merge when the pipeline for dd1431d2 succeeds
merged
mentioned in commit 1180e9c3