Merge branch 'fbmem'