CalRatio rebase and squash (update of !49732)

@emmat, to facilitate getting this through the system quickly for the Friday validation deadline I went ahead and sorted out the conflicts in your branch from the previous CalRatio MR !49732 (closed), which should be used as the reference for justification etc. Best, though if you could check that nothing odd has been introduced.

Also fine with me if you prefer to fetch my branch and submit your own MR with it, for archival purposes, but this way if other conflicts arise from ongoing trigger developments I can address them directly.