am 665ae145: Merge "Setup filesystem for automatic forced repair"

* commit '665ae145b8f117b9dfb2b4149e358cf25685b829':
  Setup filesystem for automatic forced repair