Merge branch '2765_vfs_directory_sizes'