Merge tp

Our CI machine is offline so this MR sets the CI to run on shared runners and also incorporates reviewed (and closed) !194 (closed) and !195 (closed) because 3 MRs would take a long time on the shared runners.

enabled an automatic merge when the pipeline for 2b471285 succeeds

merged