Merge branch 'depends/rmk/memory_h' into next/cleanup2