fix conflicts
Fix conflicts
Merge branch 'dev-malkab' into dev
Optional import memcache
Conflicts resolved.