Let's append to a list instead of a tuple
Merge branch 'feature/ZEN-14401' into feature/ZEN-13256