Merge "Managing filesystem_store_metadata_file variable"