Hotfix fs extra

Pietro Cavassinrequested to merge
hotfix_fs_extra into dev

Merge request reports