Merge branch 'ima-memory-use-fixes'