Merge "Change filesystem add entry API call."