We can't restrict the value to array, because otherwise we can't pass NULL
Merge origin/master