remove filname_logoff
Merge origin/remove_filenames into remove_filenames