rebase

2 jobs for !358 with nested-text-array in 72 minutes and 30 seconds (queued for 4 seconds)
merge request