Merge branch '2632_vfs_store_file_fix'