This covers some common paradigms that were not working before and were
pointed out in https://gitlab.com/groups/gitlab-org/-/epics/3621