Merge "Setup filesystem for automatic forced repair"