Set extra as a string instead of array
Merge branch 'anyfunction' into master2