Merge branches 'work.path' and 'work.mount' into work.f_path