Merge branch 'fix-yaffsfs'