Add missing param.
Merge branch 'memory_fix' into dev