Merge mfs_dir with basename, not with abspath [ci skip]