Draft: Delete: compilation of changes that are in other merge requests

This branch (tmp_swint) was used to develop the cold box testing setup; it includes a subset of changes from two open merge requests: !303 and !302 (merged) . Therefore it should not be merged itself, but I am temporarily creating it to easily see the changes that were made in this branch. I'll delete it once the other two merge requests are merged.