[FIX] Atomize argument of maps and arrays
Merge branch 'master' into sec