I've marked this as a WIP as it depends on the following MRs before we can test:
added 1 commit
Compare with previous version
unmarked as a Work In Progress
merged
mentioned in commit 47a95f2b