Reset to array instead of null
Merge branch 'feature/fix-params' into dev