Merge branch 'topic/mem-encrypt' into next