Merge pull request #2201 from robin-wayve/patch-2

add a variation of "infrastructure"