Merge "Managing filesystem_store_datadir variable"