Merge "Add gitfs support"