Merge branch 'Mortal-restudy'