Merge branch '1607_undel_fs'